From: Roger Pau Monné Date: Fri, 29 Jan 2021 16:10:33 +0000 (+0100) Subject: x86/pvh: pass module command line to dom0 X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1003 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0ecb8eb09f9fa4faefa3bf5bbeec5f94b0eef019;p=xen.git x86/pvh: pass module command line to dom0 Both the multiboot and the HVM start info structures allow passing a string together with a module. Implement the missing support in pvh_load_kernel so that module strings found in the multiboot structure are forwarded to dom0. Fixes: 62ba982424 ('x86: parse Dom0 kernel for PVHv2') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich Release-Acked-by: Ian Jackson --- diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 12a82c9d7c..878dc1d808 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -617,7 +617,22 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, mod.paddr = last_addr; mod.size = initrd->mod_end; - last_addr += ROUNDUP(initrd->mod_end, PAGE_SIZE); + last_addr += ROUNDUP(initrd->mod_end, elf_64bit(&elf) ? 8 : 4); + if ( initrd->string ) + { + char *str = __va(initrd->string); + size_t len = strlen(str) + 1; + + rc = hvm_copy_to_guest_phys(last_addr, str, len, v); + if ( rc ) + { + printk("Unable to copy module command line\n"); + return rc; + } + mod.cmdline_paddr = last_addr; + last_addr += len; + } + last_addr = ROUNDUP(last_addr, PAGE_SIZE); } /* Free temporary buffers. */